babl: only care about single precision for TRC

diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index b5a75327ec3096bdc875b57418ab10a2e97d6fea..59e484a9068764947866745f3c8b28975f5b7401 100644 (file)
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -338,10 +338,6 @@ void babl_init_db (void);
 void babl_store_db (void);
 int _babl_max_path_len (void);
 
-double babl_trc_from_linear (const Babl *trc, double value);
-double babl_trc_to_linear   (const Babl *trc, double value);
-float babl_trc_from_linearf (const Babl *trc, float value);
-float babl_trc_to_linearf   (const Babl *trc, float value);
 
 const Babl *
 babl_trc_new (const char *name,
@@ -355,30 +351,15 @@ babl_trc_new (const char *name,
  *
  * Makes linear data non-linear according to the trc.
  */
-double babl_trc_from_linear (const Babl *trc, double value);
+float babl_trc_from_linear (const Babl *trc, float value);
 
 /**
  * babl_trc_from_linear:
  *
  * Makes non-linear data with the TRC linear data.
  */
-double babl_trc_to_linear   (const Babl *trc, double value);
+float babl_trc_to_linear   (const Babl *trc, float value);
 
-/**
- * babl_trc_from_linearf:
- *
- * Makes linear data non-linear according to the trc, single precision float,
- * a little bit faster than the double version.
- */
-float babl_trc_from_linearf (const Babl *trc, float value);
-
-/**
- * babl_trc_from_linearf:
- *
- * Makes non-linear data with the TRC linear data, single precision float
- * alittle bit faster than the double version.
- */
-float babl_trc_to_linearf   (const Babl *trc, float value);
 
 void babl_space_to_xyz   (const Babl *space, const double *rgb, double *xyz);
 void babl_space_from_xyz (const Babl *space, const double *xyz, double *rgb);

diff --git a/babl/babl-trc.c b/babl/babl-trc.c
index cabd64d10ad23fbd7a34a3b78d61bb671917a3fd..b133f8dea0a772795e216583b8ac626574fbaaa9 100644 (file)
--- a/babl/babl-trc.c
+++ b/babl/babl-trc.c
@@ -103,20 +103,20 @@ babl_trc_new (const char *name,
   switch (trc_db[i].type)
   {
     case BABL_TRC_LINEAR:
-      trc_db[i].fun_to_linear = _babl_trc_linearf;
-      trc_db[i].fun_from_linear = _babl_trc_linearf;
+      trc_db[i].fun_to_linear = _babl_trc_linear;
+      trc_db[i].fun_from_linear = _babl_trc_linear;
       break;
     case BABL_TRC_GAMMA:
-      trc_db[i].fun_to_linear = _babl_trc_gamma_to_linearf;
-      trc_db[i].fun_from_linear = _babl_trc_gamma_from_linearf;
+      trc_db[i].fun_to_linear = _babl_trc_gamma_to_linear;
+      trc_db[i].fun_from_linear = _babl_trc_gamma_from_linear;
       break;
     case BABL_TRC_SRGB:
-      trc_db[i].fun_to_linear = _babl_trc_srgb_to_linearf;
-      trc_db[i].fun_from_linear = _babl_trc_srgb_from_linearf;
+      trc_db[i].fun_to_linear = _babl_trc_srgb_to_linear;
+      trc_db[i].fun_from_linear = _babl_trc_srgb_from_linear;
       break;
     case BABL_TRC_LUT:
-      trc_db[i].fun_to_linear = babl_trc_lut_to_linearf;
-      trc_db[i].fun_from_linear = babl_trc_lut_from_linearf;
+      trc_db[i].fun_to_linear = babl_trc_lut_to_linear;
+      trc_db[i].fun_from_linear = babl_trc_lut_from_linear;
       break;
   }
   return (Babl*)&trc_db[i];
@@ -162,26 +162,16 @@ babl_trc_class_init (void)
   babl_trc_new ("linear", BABL_TRC_LINEAR, 1.0, 0, NULL);
 }
 
-double babl_trc_from_linear (const Babl *trc_, double value)
+float babl_trc_from_linear (const Babl *trc_, float value)
 {
   return _babl_trc_from_linear (trc_, value);
 }
 
-double babl_trc_to_linear (const Babl *trc_, double value)
+float babl_trc_to_linear (const Babl *trc_, float value)
 {
   return _babl_trc_to_linear (trc_, value);
 }
 
-float babl_trc_from_linearf (const Babl *trc_, float value)
-{
-  return _babl_trc_from_linearf (trc_, value);
-}
-
-float babl_trc_to_linearf (const Babl *trc_, float value)
-{
-  return _babl_trc_to_linearf (trc_, value);
-}
-
 const Babl *babl_trc_lut_find (float *lut, int lut_size)
 {
   int i;

diff --git a/babl/babl-trc.h b/babl/babl-trc.h
index 3f36dac44f98f1ce69a46a8d14e1275fbb5185dd..779ec97e518cd1aa370134cbe4777218e9697e35 100644 (file)
--- a/babl/babl-trc.h
+++ b/babl/babl-trc.h
@@ -44,7 +44,7 @@ typedef struct
 } BablTRC;
 
 
-static inline float babl_trc_lut_from_linearf (const Babl *trc_, float value)
+static inline float babl_trc_lut_from_linear (const Babl *trc_, float value)
 {
   BablTRC *trc = (void*)trc_;
   int entry = value * trc->lut_size + 0.5;
@@ -56,7 +56,7 @@ static inline float babl_trc_lut_from_linearf (const Babl *trc_, float value)
   return ret;
 }
 
-static inline float babl_trc_lut_to_linearf (const Babl *trc_, float value)
+static inline float babl_trc_lut_to_linear (const Babl *trc_, float value)
 {
   BablTRC *trc = (void*)trc_;
   int entry = value * trc->lut_size + 0.5;
@@ -68,90 +68,40 @@ static inline float babl_trc_lut_to_linearf (const Babl *trc_, float value)
   return ret;
 }
 
-static inline double babl_trc_lut_from_linear (const Babl *trc_, double value)
-{
-  BablTRC *trc = (void*)trc_;
-  int entry = value * trc->lut_size + 0.5;
-  double ret = trc->inv_lut[
-    (entry >= 0 && entry < trc->lut_size) ?
-                               entry :
-                               trc->lut_size-1];
-  /* XXX: fixme, do linear interpolation */
-  return ret;
-}
-
-static inline double babl_trc_lut_to_linear (const Babl *trc_, double value)
-{
-  BablTRC *trc = (void*)trc_;
-  int entry = value * trc->lut_size + 0.5;
-  double ret = trc->lut[
-    (entry >= 0 && entry < trc->lut_size) ?
-                               entry :
-                               trc->lut_size-1];
-  /* XXX: fixme, do linear interpolation */
-  return ret;
-}
-
-static inline double _babl_trc_from_linear (const Babl *trc_, double value)
-{
-  BablTRC *trc = (void*)trc_;
-  switch (trc->type)
-  {
-    case BABL_TRC_LINEAR: return value;
-    case BABL_TRC_GAMMA:  return pow (value, 1.0/trc->gamma);
-    case BABL_TRC_SRGB:   return babl_linear_to_gamma_2_2 (value);
-    case BABL_TRC_LUT:    return babl_trc_lut_from_linear (trc_, value);
-  }
-  return value;
-}
-
-static inline double _babl_trc_to_linear (const Babl *trc_, double value)
-{
-  BablTRC *trc = (void*)trc_;
-  switch (trc->type)
-  {
-    case BABL_TRC_LINEAR: return value;
-    case BABL_TRC_GAMMA:  return pow (value, trc->gamma);
-    case BABL_TRC_SRGB:   return babl_gamma_2_2_to_linear (value);
-    case BABL_TRC_LUT:    return babl_trc_lut_to_linear (trc_, value);
-  }
-  return value;
-}
-
-static inline float _babl_trc_linearf (const Babl *trc_, float value)
+static inline float _babl_trc_linear (const Babl *trc_, float value)
 {
   return 1.0;
 }
 
-static inline float _babl_trc_gamma_to_linearf (const Babl *trc_, float value)
+static inline float _babl_trc_gamma_to_linear (const Babl *trc_, float value)
 {
   BablTRC *trc = (void*)trc_;
   return powf (value, trc->gamma);
 }
 
-static inline float _babl_trc_gamma_from_linearf (const Babl *trc_, float value)
+static inline float _babl_trc_gamma_from_linear (const Babl *trc_, float value)
 {
   BablTRC *trc = (void*)trc_;
   return powf (value, 1.0f/trc->gamma);
 }
 
-static inline float _babl_trc_srgb_to_linearf (const Babl *trc_, float value)
+static inline float _babl_trc_srgb_to_linear (const Babl *trc_, float value)
 {
-  return babl_gamma_2_2_to_linearf (value);
+  return babl_gamma_2_2_to_linear (value);
 }
 
-static inline float _babl_trc_srgb_from_linearf (const Babl *trc_, float value)
+static inline float _babl_trc_srgb_from_linear (const Babl *trc_, float value)
 {
   return babl_linear_to_gamma_2_2f (value);
 }
 
-static inline float _babl_trc_from_linearf (const Babl *trc_, float value)
+static inline float _babl_trc_from_linear (const Babl *trc_, float value)
 {
   BablTRC *trc = (void*)trc_;
   return trc->fun_from_linear (trc_, value);
 }
 
-static inline float _babl_trc_to_linearf (const Babl *trc_, float value)
+static inline float _babl_trc_to_linear (const Babl *trc_, float value)
 {
   BablTRC *trc = (void*)trc_;
   return trc->fun_to_linear (trc_, value);